Upgraded joda-time