Merge branch 'upstream-master' into runelite

# Conflicts:
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/gson/ColorTypeAdapterTest.java
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/gson/InstantTypeAdapterTest.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java

runelite-api/src/main/java/net/runelite/api/Tile.java

@@ -59,6 +59,13 @@ public interface Tile extends TileObject
 	 */
 	GroundObject getGroundObject();
 
+	/**
+	 * Sets the object on the ground layer of the tile.
+	 *
+	 * @param groundObject the ground object
+	 */
+	void setGroundObject(GroundObject groundObject);
+
 	/**
 	 * Gets the wall of the tile.
 	 *