Merge pull request #6346 from effective-webwork/3-7-update-to-3-7-2

Merge pull request #6346 from effective-webwork/3-7-update-to-3-7-2 #4429