Merge branches 'master' and 'gh-pages'