Merge remote-tracking branch 'upstream/master' into demo-mano-integration
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 19 Jun 2017 10:56:07 +0000 (12:56 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 19 Jun 2017 10:56:07 +0000 (12:56 +0200)

Trivial merge