Fix bugs 20261, 23518 r=rginda,mstoltz git-svn-id: svn://10.0.0.236/trunk@57437 18797224-902f-48f8-a5cc-f745e15eee43