f68498eaed
Merge commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb' * commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb': SmsHeader rewrite, in preparation for migration to public API.