Little template change.
Merge branch 'master' into testing
Merge remote-tracking branch 'origin/testing' into testing