Merge branch 'hotfix-006'
Merge branch 'master' of https://github.com/johnpenn/spacecloudexample