Cherry-pick 3.7.0's 4a3d5f95d9
(github pull request #252). Slightly tricky because the fix entry
nowgoes into a different file. fixes37.0 will need fixing up.
1.2 KiB
1.2 KiB