A fix for bug #8139.  I fixed a problem with the gateway plugin where it was crashing.