merge tip

diff --cc lib/sqlalchemy/ext/declarative.py
Simple merge

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

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/properties.py
Simple merge

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

diff --cc lib/sqlalchemy/orm/scoping.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

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