Workaround fix for git-commit-plugin

This commit is a workaround until git-commit-id-plugin 2.1.11 is
released. See also issue 124 of that project

Fixes gh-1484
Merge branch '1.1.x'