This ended up being fixed separately by @rsmith in 1e43349e in a
better/correct way. This patch adds the tests from the original, as
though they are reasonably covered in his patch, explicit versions seem
to have value here.
Additionally, this adds a release note for 1e43349e.
