Merge

diff --cc CHANGES
Simple merge

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

diff --cc test/dialect/test_mysql.py
Simple merge