Merge master into gh-pages.