Merge branch 'sqlstringfix'