Merge branch 'master' into master

Author: SanderMertens

examples/c/reflection/basics_json/src/main.c

@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
     ecs_os_free(str);
 
     // Convert entity & all its components to json
-    str = ecs_entity_to_json(ecs, ent);
+    str = ecs_entity_to_json(ecs, ent, NULL);
     printf("ent = %s\n", str);
     ecs_os_free(str);