Force PHP templates to install at Include phase
Merge branch 'augmaster'