Merge pull request #6907 from thess/espeak-work