Merge branch 'develop'
Merge branch 'develop'
Update app manifest to use revised MySQL module.