Merge branch 'master' into gh-pages

* master:
  Remove numbers for good times