Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle

diff --cc course/lib.php
Simple merge

diff --cc lib/upgradelib.php
Simple merge

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

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

diff --cc question/engine/questionattempt.php
Simple merge