Merge pull request #22727 from eileenmcnaughton/mod_money