Merge remote-tracking branch 'upstream/next' into next
Merge branch 'next' of github.com:Fraser999/MaidSafe-Routing into next
Merge branch 'next' of github.com:Fraser999/MaidSafe-Routing into next
Merge branch 'next' of github.com:Fraser999/MaidSafe-Routing into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Merge branch 'MAID-369-refactor-routing' of github.com:dirvine/MaidSafe-Routing into MAID-369-refactor-routing
Merge branch 'MAID-369-refactor-routing' of github.com:dirvine/MaidSafe-Routing into MAID-369-refactor-routing
Merge branch 'MAID-369-refactor-routing' of github.com:dirvine/MaidSafe-Routing into MAID-369-refactor-routing
Updated in line with changes in Common.
Merge pull request #1 from Fraser999/MAID-369-refactor-routing

Maid 369 refactor routing