Merge pull request #2819 from greg-lunarg/i2812