Added support for trigger on next for templates.
Merge branch 'master' into inews