Merge pull request #1903 from Oldiesmann/release-2.1

! Lots of SQLite3 fixes