Merge pull request #6350 from effective-webwork/3-8-1-snapshot-update

Merge pull request #6350 from effective-webwork/3-8-1-snapshot-update #4440