Anonymous - 2011-10-15

proposed patch