Merge branch 'hj/commit-allow-empty-message'