- merge hybrid attributes branch, [ticket:1903]

diff --cc lib/sqlalchemy/orm/attributes.py
index 6872dd645cc4108566fda20afb14b47b41319013,9c20b7eaf37aa1de86c48bc36c3373359aa5a152..86f950813d9aeb1d8474f084813f47ee854d586a
--- 1/lib/sqlalchemy/orm/attributes.py
--- 2/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@@ -1029,9 -1432,23 +1015,7 @@@ def has_parent(cls, obj, key, optimisti
      state = instance_state(obj)
      return manager.has_parent(state, key, optimistic)
  
 -def register_class(class_, **kw):
 -    """Register class instrumentation.
 -    
 -    Returns the existing or newly created class manager.
 -    """
 -
 -    manager = manager_of_class(class_)
 -    if manager is None:
 -        manager = _create_manager_for_cls(class_, **kw)
 -    return manager
 -    
 -def unregister_class(class_):
 -    """Unregister class instrumentation."""
 -    
 -    instrumentation_registry.unregister(class_)
 -
  def register_attribute(class_, key, **kw):
-     proxy_property = kw.pop('proxy_property', None)
-     
      comparator = kw.pop('comparator', None)
      parententity = kw.pop('parententity', None)
      doc = kw.pop('doc', None)
@@@ -1078,11 -1491,7 +1061,7 @@@ def register_descriptor(class_, key, co
                                  parententity=None, property_=None, doc=None):
      manager = manager_of_class(class_)
  
-     if proxy_property:
-         proxy_type = proxied_attribute_factory(proxy_property)
-         descriptor = proxy_type(key, proxy_property, comparator, parententity)
-     else:
-         descriptor = InstrumentedAttribute(class_, key, comparator=comparator,
 -    descriptor = InstrumentedAttribute(key, comparator=comparator,
++    descriptor = InstrumentedAttribute(class_, key, comparator=comparator,
                                              parententity=parententity)
      
      descriptor.__doc__ = doc

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

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

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

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

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

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

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