P1 build from nightly/21.1/2017-06-01T2215 with the version number updated after the fact in a spin off branch
