iOS 7 compatible
Merge remote-tracking branch 'origin/master'