Use HTML5 DOCTYPE
Merge branch 'QA_3_5'
Fix merge conflict