Merge pull request #2485 from kamailio/jchavanton/dispatcher