Merge pull request #3076 from greg-lunarg/kg124