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