Merge "labeling refactor"

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

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

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

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

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

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