meta-telephony.git branch 201705 updated. 95f1531408a8f5521cf4eb1a60dfd29a5fac0fdb