Merge branch 'release/6.8.3' into devel
oooooh more sponsors ^_^
Merge branch 'release/6.9.0'