Merge branch 'gh-pages'
Removing conflict message
Merge branch 'master' into gh-pages