Merge branch 'docker-build' into osm/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 14:49:34 +0000 (16:49 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 7 Sep 2017 14:49:34 +0000 (16:49 +0200)

Trivial merge