Merge pull request #818 from probonopd/announce