ceph/ceph — pull request #2695 by dzafman (2014-10-10 18:44:34+00:00)
Title: Wip firefly 9419

This is a backport from master branch.