Sync recent changes.

  I had intended to push a release tonight, now I'm back home.
 It'll wait until tomorrow now.