This needs merging as it's a bugfix, whereas r112396 doesn't (as it's only a RELEASE-NOTES change to trunk, and commits to other branches)...