Merges mradcliffe-sqlitedb-support