Merge pull request #5163 from neheb/mangix