Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 30 May 2017 11:50:19 +0000 (13:50 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 30 May 2017 11:50:19 +0000 (13:50 +0200)

Trivial merge