Fixing problems with missing SQLiteORM dependencies.
Merge branch 'master'