Merge branch 'refs/heads/master' into develop
^ Import Tpl.php
Merge branch 'refs/heads/develop'