Cherry-pick the block & object storage t-h-t patch
Merge pull request #31 from tomassedovic/patch-2

Cherry-pick the block & object storage t-h-t patch