Fix compatibility issue with Xcode 4.6.3
Merge remote-tracking branch 'origin'