merge tip

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

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

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

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

diff --cc test/sql/test_compiler.py
Simple merge