Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Sat, 18 May 2019 21:07:34 +0000 (23:07 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Sat, 18 May 2019 21:07:34 +0000 (23:07 +0200)

Trivial merge