fix broken build - damnit, carl
Merge branch 'cassandra-2.1' into trunk