Merge branch 'mapmod' into VickyMod