merging with /pull/461/files (Ceph and Riak)