Merge remote-tracking branch 'upstream/master' into dev-sonata-dummy-gatekeeper
authorpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 9 Mar 2016 12:04:16 +0000 (13:04 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 9 Mar 2016 12:04:16 +0000 (13:04 +0100)

Trivial merge