Merge remote-tracking branch 'maidsafe/next' into next
Merge branch 'next' of github.com:dirvine/MaidSafe-Common into next