Merge pull request #698 from deric/MODULES-4686-fix