Merge pull request #587 from TheBlueMatt/2020-04-mpp-timeout