Merge branch 'master' of github.com:open-cloud/xos