AUI-994 Number regex accepts wrong values
AUI-994 Source formatting
Merge branch 'master' into 2.0.x