Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 27 Dec 2016 15:43:48 +0000 (16:43 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 27 Dec 2016 15:43:48 +0000 (16:43 +0100)

Trivial merge