Upgrade to Jackson 2.1.x