removed double context switch
Upgrade to latest ohOs
Merge branch 'master' of ssh://core.linn.co.uk/home/git/ohTopology