Merge commit 'fabpot/master'

* commit 'fabpot/master':
  [Templating] added an output() shorcut to the Engine class