cleanup
Merge branch 'cassandra-2.0' into trunk
fix assertionerror from #6132
cleanup
merge from 1.2
Merge remote-tracking branch 'origin/trunk' into trunk
Merge branch 'cassandra-2.0' into trunk