Fix publish rake task
Merge branch 'master' into gh-pages

* master:
  Fix publish rake task