test
test
Merge branch 'master' of https://github.com/laliberte/cdb_query
Merge branch 'master' of https://github.com/laliberte/cdb_query
Merge branch 'master' of https://github.com/laliberte/cdb_query
Some more fixes