Merge remote-tracking branch 'origin/pr/140' into pr140

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

diff --cc lib/sqlalchemy/engine/base.py
Simple merge

diff --cc lib/sqlalchemy/orm/mapper.py
Simple merge

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

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

diff --cc lib/sqlalchemy/util/langhelpers.py
Simple merge