Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Tue, 14 May 2019 19:53:57 +0000 (21:53 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Tue, 14 May 2019 19:53:57 +0000 (21:53 +0200)

Trivial merge