Merge pull request #2301 from Tolriq/CorrectPlayPause