Merge branch 'html5-gh64'