! Lots of SQLite3 fixes

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
(Hopefully) fix merge conflicts

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Maybe this will fix the conflicts?

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
I think this will do it...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Missed that change as well...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
I think this will do it finally...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1 (and fix conflicts finally)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! One more fix here...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1903 from Oldiesmann/release-2.1

! Lots of SQLite3 fixes