Merge branch 'master' into fix-ldap-display-name
authorCamila Ayres <hello@camila.codes>
Tue, 1 Oct 2019 10:34:39 +0000 (12:34 +0200)
committerGitHub <noreply@github.com>
Tue, 1 Oct 2019 10:34:39 +0000 (12:34 +0200)

Trivial merge