MySQL no longer a requirement
Merge branch 'develop'