merge from master
fix for issue #611 along with more testing around double and single quotes (tests are mysql)
Fixes #480
Merge pull request #613 from bigslack/issue-611-fix

Issue 611 fix
Added yet another test case
Fixed compile error
Added another test case
Fixed #656