Merged revision 6ed983fc075450d874557e81feb0237d7a28a222 from upstream default tip

diff --cc alembic/migration.py
index 1a65cd22253de529f0d3cf4af549a14f8e5085d9,243bdbd2217d3cd0a2b0f8ca74434888957a3dec..76699062a6c9c2ae813a9eb30c6e9300ec4c09af
--- 1/alembic/migration.py
--- 2/alembic/migration.py
+++ b/alembic/migration.py
@@@ -218,9 -218,9 +218,9 @@@ class MigrationContext(object)
                  self._update_current_rev(current_rev, rev)
  
              if self.as_sql and not rev:
 -                _version.drop(self.connection)
 +                self._version.drop(self.connection)
  
-     def execute(self, sql):
+     def execute(self, sql, execution_options=None):
          """Execute a SQL construct or string statement.
          
          The underlying execution mechanics are used, that is