Version 2.1.1
Merge branch 'release-v2.1.1' into develop
Create explicit mapping for shadow-sorted title
Escape embedded double-quotes in queries and preserve double-quote wrapping