Merge branch 'master' into operations-redux

Conflicts:
	src/main/java/org/enginehub/worldedit/bukkit/DefaultNmsBlock.java
	src/main/java/org/enginehub/worldedit/bukkit/LoadedWorld.java