Merge pull request #1100 from beobal/python-1232-follow-up Follow up to PYTHON-1232; better handling of incomplete segments