Merge mjohnston's pause/unpause (bug #3252)