Remove extra slash
big ooops
Merge branch 'master' into gh-pages

* master:
  big ooops