Merge pull request #2549 from jeremy-lunarg/hayes-2479