Merge pull request #1279 from Fuzzysqurl/master

Strong sun should prevent frozen