Merge branch 'master' into gh-pages
Merge commit '8607045d2795947f07de3bfc3478477fecb98550' into gh-pages