Merge branch 'master' into pr157

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

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

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

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