Merge branch '4038-commit-hooks-accept-fixes'
drwxr-xr-x - git
drwxr-xr-x - jenkins