patch by Niels.Reedijk@gmail.com r=sergei_d git-svn-id: svn://10.0.0.236/trunk@181029 18797224-902f-48f8-a5cc-f745e15eee43