prevent 'template_dir = None' from being passed to apply_lcwd function
Add test proving #912
Changelog re #912, fixes #912
Merge branch '1.6'

Conflicts:
	docs/changelog.rst