Allow --diff on UTF-8 encoded files and templates
Merge pull request #3711 from ashorin/devel

Allow --diff on UTF-8 encoded files and templates