fix bug iOS 6.1 simulator
Merge remote-tracking branch 'origin/master'