Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jul 2017 21:18:57 +0000 (23:18 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jul 2017 21:18:57 +0000 (23:18 +0200)

Trivial merge