fixed crash on old (Android 2.0 and 2.1) devices
Merge branch 'master' into ice-cream-sandwich