Simplify updateFromJson:.
Merge branch 'refs/heads/master' into object_queue