ceph/ceph — pull request #2963 by dmick (2014-11-18 23:41:43+00:00)
Title: Wip 10114 giant

backport from master. Cherry-picked original and fixup commit for clarity.