Update master with socioware-13w44 fixes