Make iPhone check more iphone-specific
Merge branch 'refs/heads/master' into antisocial