Merge pull request #1915 from Oldiesmann/release-2.1

A few more SQLite3 fixes
Merge pull request #1916 from Oldiesmann/release-2.1

- Down with SQLite