merge tip

diff --cc lib/sqlalchemy/engine/base.py
Simple merge

diff --cc lib/sqlalchemy/orm/attributes.py
index 2701fc879e0335083a693e2df21067feeeae895c,f91ff51f2f7b489e34020dd87f02d6e0dcdc1b43..a09463a4f2d0a4e7ff72232597364cdb06c3c9c7
--- 1/lib/sqlalchemy/orm/attributes.py
--- 2/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@@ -538,8 -482,9 +539,9 @@@ class MutableScalarAttributeImpl(Scalar
      """
  
      uses_objects = False
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_,
 +    def __init__(self, class_, key, callable_, events,
                      class_manager, copy_function=None,
                      compare_function=None, **kwargs):
          super(ScalarAttributeImpl, self).__init__(
@@@ -604,8 -549,9 +606,9 @@@ class ScalarObjectAttributeImpl(ScalarA
  
      accepts_scalar_loader = False
      uses_objects = True
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_, 
 +    def __init__(self, class_, key, callable_, events,
                      trackparent=False, extension=None, copy_function=None,
                      compare_function=None, **kwargs):
          super(ScalarObjectAttributeImpl, self).__init__(
@@@ -694,8 -640,9 +697,9 @@@ class CollectionAttributeImpl(Attribute
      """
      accepts_scalar_loader = False
      uses_objects = True
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_, 
 +    def __init__(self, class_, key, callable_, events,
                      typecallable=None, trackparent=False, extension=None,
                      copy_function=None, compare_function=None, **kwargs):
          super(CollectionAttributeImpl, self).__init__(

diff --cc lib/sqlalchemy/orm/interfaces.py
Simple merge

diff --cc lib/sqlalchemy/orm/mapper.py
Simple merge