Merge remote-tracking branch 'origin/develop' into bugfix/gitlab-ci

This commit is contained in:
Daniel Siepmann 2017-04-11 20:59:45 +02:00
commit 0be4aeca87
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4