fix templates not having a root element
Merge remote-tracking branch 'refs/remotes/origin/angular' into angular