Brent Roman - 2011-11-29

see main patch discription