html5rocks/www.html5rocks.com — pull request #1144 by PaulKinlan (2014-06-10 10:32:16+00:00)
Title: Merging fixes live

Thanks to @samdutton and moi.