Anonymous - 2012-02-18

patch - should be applied to trunk