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