Added layout parameter to template.new.
Merge remote-tracking branch 'origin/master'