React 0.11.2
Merge branch '1.7-dev' into staging.glsl.io