Fix preness.
Addify @deoxxa's talk.
Merge branch 'master' into gh-pages

* master:
  Addify @deoxxa's talk.
  Fix preness.