Correctly handle international numbers

Numbers including the international prefix need to be properly handled
as international calls.
Merge branch 'inincaas-upstream'