Merge remote-tracking branch 'upstream/master' into demo-mano-integration
authorpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000 (13:41 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000 (13:41 +0200)

Trivial merge