Backport of r74435. Not merged/blocked w/ svnmerge.py as the tool is erroring out on me.
3 files changed