Preparations for 1.2 release.

If it looks good, please merge and tag, then I will upload the release.
What's with the 2 space indentation?