Original "Implement completion limiting" patch (without tests)
Pedro's doc tweak