Dev

assigned to @mweise

added 12 commits

• 4d546682...d1e80995 - 11 commits from branch master
• 19c49007 - Merge branch 'master' into dev

Compare with previous version

marked this merge request as ready

mentioned in commit 682b4bc1

merged