Fix Java translation.
Merge branch 'clean-up' into intervals
Merge branch 'intervals' into update-json.net