Merge pull request #3086 from jeremy-lunarg/hayes-fix-3073