Merge pull request #3869 from tim-moody/8.2.1-www-data

Merge pull request #3869 from tim-moody/8.2.1-www-data #556