SQL: use '-- ' as comment prefix instead of #
Merge remote-tracking branch 'origin/master'