Merge pull request #1594 from rubenk/ceph-fix-shadowing-issue