Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan-cukic@users.noreply.github.com>
Mon, 3 Jun 2019 07:11:56 +0000 (09:11 +0200)
committerGitHub <noreply@github.com>
Mon, 3 Jun 2019 07:11:56 +0000 (09:11 +0200)

Trivial merge