Merge pull request from SamC302/stop-repeating Stopped repeating questions