Merge branch 'master' of github.com:ijl/sqlalchemy into merge_2183

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

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

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

diff --cc test/dialect/postgresql/test_dialect.py
Simple merge