Merged changes missed from MaidSafe main fork.