Merge branch 'zf/maint-gitweb-acname' into maint