label 99.9th correctly
merge from 1.2
Merge branch 'cassandra-2.0' into trunk