Merge branch 'release/6.8.1' into devel
gah, do you even indent, bro?
Merge branch 'release/6.8.2'