Merge branch 'rr/rebase-reflog-message-reword'