Merge branch 'develop'
Merge branch 'develop'
Add settings as a default template object and avoid giving a free pass to exceptions other than TemplateDoesNotExist.
Merge branch 'master' into develop