Merge remote-tracking branch 'origin/sqlite2' into sqlite2