(tests depend on patch #272565)
Applied as r31522, thanks.
Bug watches keep track of this bug in other bug trackers.
Applied as r31522, thanks.