MySQL command line doesn't like the triple dash for comments.
Merge remote-tracking branch 'upstream/master'