Fix previous feature
Merge branch 'master' into staging.glsl.io