Merge branch 'stable-2.8'

* stable-2.8:
  Fix commit-msg hint to actually work