Merge branch 'jc/commit-is-spelled-with-two-ems'