Map org.w3c.dom.Attr
Merge branch 'master' into develop