Merge branch 'develop'
Include http-equiv in meta
Merge branch 'master' into develop