merge: akonadi dep fixed