patch=cls, r=dveditz, sr=alecf, a=rjesup git-svn-id: svn://10.0.0.236/trunk@118060 18797224-902f-48f8-a5cc-f745e15eee43