Merge branch 'master' of git.openwrt.org:feed/telephony