Bad merge, not supposed to have onstop and onpause, just the latter
Merge pull request #1014 from garvankeeley/fix-bad-merge

Bad merge, not supposed to have onstop and onpause, just the latter