Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle