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