Minor clean up.
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev