Merge pull request #501 from mhaskel/MODULES-1934