Update to upstream release 6.8.2
PR: 199914 Submitted by: takefu@airport.fm Approved by: roy@marples.name (maintainer)