more links for html5
Merge remote-tracking branch 'upstream/master'