Fix iOS settings
Merge branch 'master' into summaries