Bugfix???
Merge pull request #1 from mdegerne/fix_cinder_all

Bugfix???