Force files modified via Xcode to use spaces.
Merge branch 'master' into ARC