Merge branch 'master' into javascript-binding
authorMaximilian Krambach <maximilian.krambach@intevation.de>
Thu, 24 May 2018 12:03:09 +0000 (14:03 +0200)
committerMaximilian Krambach <maximilian.krambach@intevation.de>
Thu, 24 May 2018 12:03:09 +0000 (14:03 +0200)

Trivial merge