Merge branch 'jh/commit-status'