Merge branch 'master' into database-test
Merge branch 'database-test' of https://github.com/trousev/cleer into database-test
That's falling with DatabaseError
Merge branch 'database-test' of https://github.com/trousev/cleer into database-test