Update template package to latest from upstream
Merge pull request #27 from kabel/7.x-4.0.x

Update template package to latest from upstream