even better templates
Merge branch 'master' of https://github.com/dbrownbeta/dh-overflow into devel