International SMS now working
Merge commit 'c630b3f8f8cbeff219dddc05050f6554f01c5cca'