Merge master.

diff --cc release
index 29da203c128a4d32d73bab96177ebc84f5409c7b,29da203c128a4d32d73bab96177ebc84f5409c7b..ad5bdbbf1d1bbe68bb03dbc008a5f827681e20ec
--- 1/release
--- 2/release
+++ b/release
@@@ -52,6 -52,6 +52,8 @@@ def append_to_changelog(version)
      f.write('%d-%02d-%02d  Carl Hetherington  <cth@carlh.net>\n\n\t* Version %s released.\n\n' % (now.year, now.month, now.day, version))
      f.write(c)
  
++command("git checkout master")
++
  release_version_string = rewrite_wscript(release_version)
  append_to_changelog(release_version_string)