Changed to permit unit names contain dots.
*** This fix is a copy of that applied to 3.x branch at r2203.
Authored by: delphidabbler 2012-08-16
Parent: [r2209]
Child: [r2211]
