Merge remote-tracking branch 'origin/master'
Fixinq sql issue. resolves #1