Merge pull request #1 from KhronosGroup/master
authorNorbert Nopper <Norbert.Nopper@freescale.com>
Fri, 6 Feb 2015 19:53:06 +0000 (20:53 +0100)
committerNorbert Nopper <Norbert.Nopper@freescale.com>
Fri, 6 Feb 2015 19:53:06 +0000 (20:53 +0100)
Update from head fork.


Trivial merge