Merge branch 'master' into html5
fix
Merge branch 'html5'