Merge branch 'master' of https://github.com/zzzeek/sqlalchemy into feature/postgres...

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

diff --cc setup.cfg
Simple merge

diff --cc test/requirements.py
Simple merge