ios5 support
Merge remote-tracking branch 'origin'