Upgrade joda-time to 2.4