Fixed bug introduced by 8abd0ffb26d57e2d19f8cbed260de24bcf6b74a1
Merge branch 'V1.1' into Minecraft-Port
Smalll fixes