[pull] dev from mrdoob:dev#1268

pull[bot] merged 2 commits into

code:devcode/lib-three.js:devfrom

mrdoob:devmrdoob/three.js:devCopy head branch name to clipboard