Fix a reference to an undefined element.
Merge branch 'master' into vec4-stack