A small optimization. thnx @staabm
Merge branch 'master' into caldav-sync
Started with a new migration script.