Merge change I44d4cbec into eclair

* changes:
  Fix some SMS encode issues.