Rebased to Lmod 4.2.1.