accept mask: 9999 as valid masktemplate
Merge branch '1.x' into 2.x