Merge remote-tracking branch 'ceph/master'