Merge branch 'master' of https://github.com/stackforge/cloudcafe
Merge branch 'master' into glance