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