commit e41b8715c2dae60ea9db77640f87274fc31ef132
Merge: d4985a2 15b91d9
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Fri Jun 5 22:30:16 2015 +0200

    Merge branch 'feature/3f9d21-escape-strings-in-templates' into development (closes: #3f9d21)