Merge branch 'MDL-46091' of git://github.com/timhunt/moodle

diff --cc mod/quiz/lang/en/quiz.php
Simple merge

diff --cc mod/quiz/renderer.php
Simple merge

diff --cc mod/quiz/styles.css
Simple merge

diff --cc mod/quiz/view.php
Simple merge