DSP-1371: Backport CASSANDRA-5231
Merge pull request #34 from riptano/DSP-1371

DSP-1371: Backport CASSANDRA-5231