Code

Merge branch 'aw/rebase-i-stop-on-failure-to-amend'