Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Sat, 11 May 2019 05:15:55 +0000 (07:15 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Sat, 11 May 2019 17:19:00 +0000 (19:19 +0200)

Trivial merge