maks jekyll safe for gh-pages
Merge branch 'master' into gh-pages

* master:
  maks jekyll safe for gh-pages