Merge branch 'master' of https://github.com/Cahu/OpenStack-Nova