Start prepration for 2.1.2.
Remerge strings.
Minor update to build script.
Something weird happened to the patch preamble.
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.09.16-17.00