Merge branch 'master' into fdbsql-tests

Conflicts:
	lib/sqlalchemy/testing/exclusions.py

diff --cc lib/sqlalchemy/testing/engines.py
Simple merge

diff --cc lib/sqlalchemy/testing/exclusions.py
index c9f81c8b9981f20b6fe5acd8d4a03cf91c79a407,f94724608aeb1ce7454c1db8835ddfc81b6dfa0a..e3d91300dcfdb45535cad7d8553f3265fee8216d
--- 1/lib/sqlalchemy/testing/exclusions.py
--- 2/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@@ -132,10 -130,10 +132,10 @@@ class compound(object)
          for fail in self.fails:
              if fail(config):
                  print(("%s failed as expected (%s): %s " % (
 -                    name, fail._as_string(config), str(ex))))
 +                    name, fail._as_string(config), str(exc_value))))
                  break
          else:
-             raise exc_type, exc_value, exc_traceback
+             util.raise_from_cause(ex)
  
      def _expect_success(self, config, name='block'):
          if not self.fails:

diff --cc test/orm/test_query.py
Simple merge

diff --cc test/requirements.py
Simple merge

diff --cc test/sql/test_metadata.py
Simple merge