HTML5 fix
HTML5 asset fix
Update to 1.1.1
Merge remote-tracking branch 'upstream/master'