Added fix for mysql commands out of sync error.
Merge remote-tracking branch 'upstream/master'