Fixed (#841)

This is a fix for #841 and supporting test.
Or just
 - `git rebase -i HEAD^^`
 - Mark first commit for edit
 - Edit commit
 - `git rebase --continue`

:wink: