merge template repository

Nothing important, really – just keeping up-to-date commit-wise.