Force Xcode to use spaces on source code files.
Merge branch 'master' into ARC
Fix a release bug.