Merge pull request #6347 from effective-webwork/3-8-update-to-3-8-0

Merge pull request #6347 from effective-webwork/3-8-update-to-3-8-0 #4435