Merge r77879 from trunk.
I think it should have been merged in r78201, and was messing up the doc build (you can see it in the content in 1.50 beta1).