Fixes #5985. Because it was such a minor change I also dirtied down the maintenance tunnels even more.
Merge remote-tracking branch 'upstream/dev' into Warn
Merge pull request #5989 from PsiOmegaDelta/Warn

Fixes #5985