merge from datastax/java-driver