Merge pull request #6458 from totten/4.6-toxic-list