Fix for MySQL 5.6 #1226