Merge pull request #993 from annando/pump-notice