"Deploy from master branch"
Merge branch 'gh-pages'

* gh-pages:
  "Deploy from master branch"