Fixes #2119 - Properly support colon-separated modulepath
(cherry picked from commit 722bba2d153d021827d7a1b6eb32748d0ceb7f86)