Merge pull request #6712 from systemcrash/discard_text