Merge remote-tracking branch 'origin/pr/132' into pr132

diff --cc test/dialect/postgresql/test_dialect.py
index 9f86aaa7afac5ac2edfb4ebeb13766430aa02100,cf470f05544a3a1e2d8282a643b748227d805bc9..bdd292fff68c82aa12973688f430a80b78b9ee6b
--- 1/test/dialect/postgresql/test_dialect.py
--- 2/test/dialect/postgresql/test_dialect.py
+++ b/test/dialect/postgresql/test_dialect.py
@@@ -115,11 -117,11 +117,12 @@@ class MiscTest(fixtures.TestBase, Asser
  
          e = engines.testing_engine(options={'client_encoding': test_encoding})
          c = e.connect()
-         eq_(c.connection.connection.encoding, test_encoding)
+         new_encoding = c.execute("show client_encoding").fetchone()[0]
+         eq_(new_encoding, test_encoding)
  
      @testing.only_on(
 -        ['postgresql+psycopg2', 'postgresql+pg8000'],
 +        ['postgresql+psycopg2', 'postgresql+pg8000',
 +         'postgresql+psycopg2cffi'],
          'psycopg2 / pg8000 - specific feature')
      @engines.close_open_connections
      def test_autocommit_isolation_level(self):