unused type casting
Merge branch 'master' into android-1.5
decimal separator
Merge branch 'master' into android-1.5