Patch by jonathan.watt@strath.ac.uk, r=tor. git-svn-id: svn://10.0.0.236/trunk@165366 18797224-902f-48f8-a5cc-f745e15eee43