Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop
authorKatja Luther <k.luther@bgbm.org>
Fri, 5 Jan 2018 09:52:59 +0000 (10:52 +0100)
committerKatja Luther <k.luther@bgbm.org>
Fri, 5 Jan 2018 09:52:59 +0000 (10:52 +0100)

Trivial merge