JSlint pass
Merge branch 'master' into iphone