Merge branches 'gh-pages' and 'master'