Update based on recommendations by @SomeoneWeird.
Merge branch 'master' into gh-pages

* master:
  Update based on recommendations by @SomeoneWeird.