MDL-37993-quiz-completion-options Implemennted changes suggested by Damyon and Tim, but on the wrong branch.