DSP-1773: Backport CASSANDRA-5310
Merge pull request #33 from riptano/DSP-1773

DSP-1773: Backport CASSANDRA-5310