Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle