Merge branch 'ak/pre-receive-hook-template-modefix' into maint