Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)
Merge branch 'cassandra-1.2' into trunk