r=javi sr=hewitt idea-for-fix=varga git-svn-id: svn://10.0.0.236/trunk@121079 18797224-902f-48f8-a5cc-f745e15eee43