Merge branch 'master' into gh-pages
.
Sorry Safari
,
Safari sux
.
Merge branch 'gh-pages'