Moved to joda-time 2.1