Merge branch 'gh-pages'
ticket-reopened
Merge branch 'master' into gh-pages