Refactored last merge to fix HTML5 data-attributes handling.