Gentler version for CASSANDRA-5172
Merge branch 'cassandra-1.2' into trunk