Fix typo error on docs
Merge remote-tracking branch 'upstream/master' into devel
Document parameters passed to Template helpers towards #3017