Merge branch 'master' of https://github.com/open-cloud/xos into feature/bootstrap