Possible workaround for http://bugs.mysql.com/bug.php?id=57432
Merge branch 'release/2.1'

Conflicts:
	db/src/main/java/com/psddev/dari/db/SqlDatabase.java