Patched 0.12.1 gem (based on May 30, 2012 gem)