More complete fix for JAVA-318
Merge branch '2.0' of https://github.com/datastax/java-driver into 2.0