Merge branch '01' into 01-cleanup
better TRE_CHAR_MAX fix
Merge branch '01-cleanup' into 06-def-nmcnt-macros