unused type casting
Merge branch 'master' into ice-cream-sandwich
decimal separator
Merge branch 'master' into ice-cream-sandwich