Fix a bug gordon found
Merge branch 'master' of https://github.com/Downstream/ds_cinder