Xcode 6 / iPhone 6 compatibility updates
Merge remote-tracking branch pull/7047.

And fix the whitespace + optimize the pngs.