* If the black trinity escorts die, shouldn't blow up anymore.
Merge remote-tracking branch 'upstream/master'
removed time limit parameter from cargoGetTransit function in cargo_common.lua which was no longer used