Merge pull request #11559 from peter-stadler/sqlparse