Merge conflicts between 3.0.9 and 3.0.12
branches: 1.2.2;regen
merge the rest of the changes, this now builds on x86_64.