sync with upstream changes (#2476)
sync with upstream changes (#2476)


wizgrav/aframe,RSpace/aframe,jaxmolina/ar,ngokevin/aframe,ngokevin/aframe,darkwing/aframe,chenzlabs/aframe,googlecreativelab/aframe,mkungla/aframe,RSpace/aframe,darkwing/aframe,googlecreativelab/aframe,mkungla/aframe,dmarcos/aframe,aframevr/aframe,aframevr/aframe,chenzlabs/aframe,weddingdj/aframe,jaxmolina/ar,wizgrav/aframe,dmarcos/aframe,weddingdj/aframe