Merge pull request #519 from datastax/py522

PYTHON-522