Merge pull request #6756 from karlp/lsqlite-095-master