Merge branch 'master' into api

# Conflicts:
#	src/module/io.c

src/vm/wren_compiler.c

@@ -1321,7 +1321,7 @@ static int resolveLocal(Compiler* compiler, const char* name, int length)
 
 // Adds an upvalue to [compiler]'s function with the given properties. Does not
 // add one if an upvalue for that variable is already in the list. Returns the
-// index of the uvpalue.
+// index of the upvalue.
 static int addUpvalue(Compiler* compiler, bool isLocal, int index)
 {
   // Look for an existing one.

src/vm/wren_debug.c

@@ -50,7 +50,7 @@ static void dumpObject(Obj* obj)
     case OBJ_RANGE: printf("[range %p]", obj); break;
     case OBJ_STRING: printf("%s", ((ObjString*)obj)->value); break;
     case OBJ_UPVALUE: printf("[upvalue %p]", obj); break;
-    default: printf("[unknown object]"); break;
+    default: printf("[unknown object %d]", obj->type); break;
   }
 }
 

src/vm/wren_value.c

@@ -1160,10 +1160,10 @@ void wrenFreeObj(WrenVM* vm, Obj* obj)
       wrenValueBufferClear(vm, &((ObjModule*)obj)->variables);
       break;
 
-    case OBJ_STRING:
     case OBJ_CLOSURE:
     case OBJ_INSTANCE:
     case OBJ_RANGE:
+    case OBJ_STRING:
     case OBJ_UPVALUE:
       break;
   }