Merge pull request #189 from robho/yate6