Develop

Merged hotfixes to mysql code