* ODBC DSN detection * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * Spelling errors