Merge remote-tracking branch 'upstream/next' into clang_format
Merge branch 'clang_format' of github.com:Fraser999/MaidSafe into clang_format