meta-telephony.git branch 201705 updated. 5769ee86d83e0ccc10af27f9eee6c053f6dd36ab