Commit patch for ODBC unicode improvements