Merge pull request #647 from robho/yate-6.3.0_21.02