Merge Master into gh-pages.