Merge branch 'release/6.9.1' into devel
Merge branch 'master' into devel
oops that was buggy.
Merge branch 'release/6.9.2'