Template updated with lpenz.org2.
Merge remote-tracking branch 'origin/devel'