Merge branch 'master' of github.com:feross/oculus-drone