Comment 8 for bug 1191883

Thanks for the patch! I modified it a bit to avoid getting the warning about an invalid disconnect and sent it upstream. Will mark this bug as a duplicate of the other one.