Backport master
Backport master
Normalization

Normalize tabs vs spaces in templating files. Also update the theme
reference to omit /extend.
Version bump
Merge dev updates