Fix for media endpoints disposed off the watchable thread
Merge branch 'master' of ssh://core.linn.co.uk/home/git/ohTopology