Test for JAVA-333
Test for JAVA-333
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/src/test/java/com/datastax/driver/core/querybuilder/QueryBuilderTest.java