Merge branch 'master' into split-view

latest commit 4326a02a3c
Holger Berndt authored