Commit 3ce42863 authored Aug 09, 2019 by Oliver Falk

Merge branch 'devel' into 'master'

Merge devel <-> master

See merge request !151