Merge pull request #3060 from greg-lunarg/limit3