Remove className as an attribute to add
Merge branch '1.x' into gh-pages