Merge "use ..deprecated directive w/ version in all cases"

diff --cc lib/sqlalchemy/dialects/mssql/base.py
Simple merge

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

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

diff --cc lib/sqlalchemy/event/api.py
Simple merge

diff --cc lib/sqlalchemy/event/legacy.py
Simple merge

diff --cc lib/sqlalchemy/events.py
Simple merge

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

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

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

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

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

diff --cc lib/sqlalchemy/orm/events.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/relationships.py
Simple merge

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

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

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

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

diff --cc lib/sqlalchemy/sql/compiler.py
Simple merge

diff --cc lib/sqlalchemy/sql/ddl.py
Simple merge

diff --cc lib/sqlalchemy/sql/elements.py
Simple merge

diff --cc lib/sqlalchemy/sql/functions.py
Simple merge

diff --cc lib/sqlalchemy/sql/schema.py
Simple merge

diff --cc lib/sqlalchemy/sql/selectable.py
Simple merge

diff --cc lib/sqlalchemy/sql/sqltypes.py
Simple merge

diff --cc lib/sqlalchemy/testing/suite/test_reflection.py
Simple merge