Merge branch 'srtcp2'
Fixes issues with moving metacontacts.