Merge pull request #560 from mhaskel/MODULES-2446