Merge pull request voxpupuli#42 from philsturgeon/patch-1

Fix deprecation warnings in template