Added element override/option
Merge branch '1.x' into gh-pages