Upgraded to latest version of three.js r69
Merge from master: Upgrading to three.js r69