Merge branch 'master' of https://github.com/Doude/devstack
Merge branch 'master' of https://github.com/Doude/devstack