incoming version=1.6
Merge branch 'master' into staging.glsl.io