IOS 7.
Merge remote-tracking branch 'origin/master'
IOS 7.x