Commit 61ee8eb5 authored Dec 10, 2020 by Mark Beierl

Merge branch 'sol006' into 'master'

Sol006 merge

See merge request !106