Allow themes to override HTML output with msi-templates directory.
Version bump.
Merge branch 'r/1.3.6'