Merge remote-tracking branch 'upstream/next' into routing_v2
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2
Updated NodeId.  Tests still to be completed.
Merge pull request #64 from Fraser999/routing_v2

Updated NodeId.