Merge pull request #429 from steve-lunarg/samplers.sm5