patch by jason_barnabe@fastmail.fm r=mconnor git-svn-id: svn://10.0.0.236/trunk@185375 18797224-902f-48f8-a5cc-f745e15eee43