Merge pull request #254 from ceph/bz1842390

No match.