Merge remote-tracking branch 'upstream/master'

Valid html5 doctype and head tags added.