Added hotfix - doctype that make problems
Merge branch 'master' into iss53