Fixes #817
Merge branch 'master' of github.com:html5rocks/www.html5rocks.com