relyea wrote the patch. r=wtc,nelsonb. git-svn-id: svn://10.0.0.236/trunk@180160 18797224-902f-48f8-a5cc-f745e15eee43