Merge pull request #858 from lionce/MODULES-9017