Merge pull request #6496 from totten/master-regen-leak