Also sanitize ios tokens
Merge branch 'pr/347'