Addon to previous checkin (fix for 63582) git-svn-id: svn://10.0.0.236/trunk@83989 18797224-902f-48f8-a5cc-f745e15eee43