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

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

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

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

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

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