Merge pull request #2 from KhronosGroup/master

Update master