Merge branch 'master' into javascript-binding
authorMaximilian Krambach <maximilian.krambach@intevation.de>
Fri, 20 Apr 2018 13:23:57 +0000 (15:23 +0200)
committerMaximilian Krambach <maximilian.krambach@intevation.de>
Fri, 20 Apr 2018 13:23:57 +0000 (15:23 +0200)

Trivial merge