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