Upgrade to bleach 1.2.x