Updates towards next point release.
Merge branch 'master' into gh-pages

* master:
  Updates towards next point release.