Ash/13w46 fixes into socioware/13w46-fixes