Minor change, branch e

Going to merge this branch via the commandline, with `--no-ff` *and* a reference to the PR/issue number in the commit message.

My hope is that this will mark the PR as closed on Github, but I suspect it will not.