Merge pull request #5030 from annando/fix-sql