1381, fixed Json round trip of longs.
Merge remote-tracking branch 'origin/master'
JSOn changes