Merge pull request #6945 from annando/announce