Attempting a build fix - having some trouble building 4.0 locally after installing VS2015 preview so unable to verify