Merge branch 'develop' into oauth2
authorRoger Braun <roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000 (20:54 +0200)
committerRoger Braun <roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000 (20:54 +0200)

Trivial merge