Rebase patch from gh-pages
Merge branch 'master' into gh-pages