merge from http://git-wip-us.apache.org/repos/asf/cassandra.git