support for native JSON data types
Merge remote-tracking branch 'origin/master'