4714 --resolve add decode
Merge branch 'master' of fs-git:freeswitch