Merge pull request #157 from alxhub/master

Simple fix
Fix bug where fromJson adds explicit nulls.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into fix-from-json
Merge pull request #160 from alxhub/master

Port some quick fixes.
Merge branch 'master' into fix-from-json
Fix null assignments to lists.
Merge pull request #159 from alxhub/fix-from-json

fromJson() set fields with parse expressions to null explicitly. Avoid that.
Merge branch 'master' into pub-server