Merge commit 'd3db33c008542c7044f3ed8c19f3a45679fcf52e' into cassandra-3.0