Merge upstream changes: webgl.ign