Modified imports and all subsequent occurrences.
Merge pull request #2 from ctn-waterloo/pacman-revs-3312-3319

Upstream Changes: PACMAN103 r3312-3319