13w46 fixes into master for socioware-1346