Merge remote-tracking branch 'refs/remotes/origin/dev'
Updated templates
Bump version
Update build process, see y-lohse#47