Merge branch 'release/6.8.2' into devel
mack wanted that stuff removed for now.
Merge branch 'release/6.8.3'