Merge pull request #3077 from greg-lunarg/edos3