Merge pull request #2957 from G8XSU/pause-events