Merge pull request #7598 from apple/hughbe-patch-1

Fix build break