Merge "Update joda-time to version 2.7"