Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

src/main/java/carpet/script/value/MapValue.java

@@ -124,7 +124,7 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     @Override
     public void append(Value v)
     {
-        put(v);
+        map.put(v, Value.NULL);
     }
 
     @Override