Merged MySQLite library
Merge branch 'master' into workshop