manual merge of https://github.com/datastax/csharp-driver/pull/18
fix compilation problems