adjust regex of non-negative decimal
Merge branch '1.x' into 2.x