This should probably be merged back into the 3.2 branch; cherry-picking the head rev on the branch applies cleanly. It even seems to merge into 3.1 OK.
This should probably be merged back into the 3.2 branch; cherry-picking the head rev on the branch applies cleanly. It even seems to merge into 3.1 OK.