Merge pull request #261 from mhaskel/MODULES-2125