Merge branch 'jc/merge-reword'