Merge pull request #520 from TheBlueMatt/2020-02-events-in-monitors