This repository was archived by the owner on Mar 25, 2018. It is now read-only.

Merge revisions 7147 and 7407 to the 3.1 branch to fix x64 compilatio…