add # definitions which allows alfanumerics with autouppercasing
Merge branch '1.x' into 2.x