fix for 56706 git-svn-id: svn://10.0.0.236/trunk@93501 18797224-902f-48f8-a5cc-f745e15eee43
fix for 74676 git-svn-id: svn://10.0.0.236/trunk@91262 18797224-902f-48f8-a5cc-f745e15eee43