Turn off debug
Merge branch 'master' into single-template