Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 15 Sep 2017 07:23:59 +0000 (09:23 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 15 Sep 2017 07:23:59 +0000 (09:23 +0200)

Trivial merge