Merge branch 'jk/sq-dequote-on-bogus-input'