Merge branches 'master' and '1.4.6'
changes for 6.8.2
minor correction of the documentation
Merge branches '1.4.6' and 'master' into 1.4.6