Upgraded joda-time
Merge pull request #3695 from mkurz/jodaTimeUpgrade

Upgraded joda-time