Merge remote-tracking branch 'upstream/next' into MAID-369-refactor-routing
Merge branch 'MAID-369-refactor-routing' of github.com:Fraser999/MaidSafe-Common into MAID-369-refactor-routing