merge from mrdoob master