Merge pull request #6938 from mikeller/fix_flash_overflow