Merge remote-tracking branch 'upstream/master' into rs

Needed for 64-bit and partner releases.