meta-telephony.git branch 201705 updated. 4f8e0025097865f75c484fa15dcb19df8fef5bd2