Template settings override fix
Merge pull request #848 from gpierret/master

Template settings override fix