Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle