Merge pull request #980 from narfbg/develop-db-odbc

Improve the ODBC database driver