Merge branch 'master' into develop
No longer using realpath() when building a template
Merge branch 'develop'