Merged MaidSafe/drive_v2