Fixes #6102: Allow numbers in package names, BZ1047811.
Merge pull request #4225 from ehelms/fixes-6102

Fixes #6102: Allow numbers in package names, BZ1047811.