Merge branch 'gpgmepp'
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 10 May 2016 14:43:36 +0000 (16:43 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 10 May 2016 14:43:36 +0000 (16:43 +0200)

Trivial merge