Square @deoxxa.
Merge branch 'master' into gh-pages

* master:
  Square @deoxxa.