Add 404
Merge branch 'master' into gh-pages

* master:
  Add 404