Updated with latest changes to get MySQL setup with enough connections
Merge remote-tracking branch 'origin/master'