[sr-dev] git:master:b84859ac: Merge pull request #1891 from mslehto/old_modules_dir