Merge branch 'MDL-68299-master' of git://github.com/bmbrands/moodle