Merge pull request #1 from KhronosGroup/master

Merging master