Revert "Merge branches 'master' and 'gh-pages' into gh-pages"

This reverts commit d0250b6969c34c98945e40330391509e15550319.