A

Will Github recognize that this PR was merged from the command line? We'll pull and rebase off master before merging and pushing, but this should not re-write any history of this branch, since it was rebased before pushing.

The merge into master will *not* be done `--no-ff`, so it will be a fast forward