Syncing with upstream.

Attempting to sync with upstream so that I can implement ibm_db_dbi driver.