Decimal mask drops digits
rebuild
New android start
Merge branch '1.x' into 2.x