Merge pull request #2857 from jeremy-lunarg/hayes-fix-warnings