Merge pull request #547 from mhaskel/MODULES-2190