Merge branch 'MDL-25791_20_quizdb_rev1' of git://github.com/samhemelryk/moodle