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