Close GH-402: replace data attribute in <object> tag. Fixes #401
Merge remote-tracking branch 'upstream/master'