pre merge. mac changes
merge. custom html5 attrs used