Fixed HTML5 issue
Merge branch '2.0'