Merge pull request #780 from annando/notice-pumpio