added support for html data-* properties
Merge remote-tracking branch 'upstream/master'