Merge branch 'abe' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 8 Jul 2017 18:21:19 +0000 (20:21 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 8 Jul 2017 18:21:19 +0000 (20:21 +0200)

Trivial merge