Merge branch 'master' into ticket_3100

diff --cc lib/sqlalchemy/orm/persistence.py
index 2a697a6f98e67bd58d3b6aa3a84e79e173111f09,74e69e44c51e19a7e5186a01af36bee9d1204651..1288c910f9fe72b9623f6161061e7b96192b8b8e
--- 1/lib/sqlalchemy/orm/persistence.py
--- 2/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@@ -923,12 -799,11 +923,12 @@@ def _postfetch(mapper, uowtransaction, 
      after an INSERT or UPDATE statement has proceeded for that
      state."""
  
-     prefetch_cols = result.context.prefetch_cols
-     postfetch_cols = result.context.postfetch_cols
-     returning_cols = result.context.returning_cols
+     prefetch_cols = result.context.compiled.prefetch
+     postfetch_cols = result.context.compiled.postfetch
+     returning_cols = result.context.compiled.returning
  
 -    if mapper.version_id_col is not None:
 +    if mapper.version_id_col is not None and \
 +            mapper.version_id_col in mapper._cols_by_table[table]:
          prefetch_cols = list(prefetch_cols) + [mapper.version_id_col]
  
      if returning_cols: