Merge pull request #1 from CleverRaven/master

pull requ to what i hope is my own repo to get changes for the first time
turns toasterpastries into the frozen kind
Merge pull request #7158 from cSep/fix6689

Fixes #6689,  turns toasterpastries into the frozen kind