merged with master untested
Merge branch 'dse_3.1' of https://github.com/datastax/csharp-driver into dse_3.1