fixed crash bug on ICS+ devices
Merge remote-tracking branch 'origin/master'