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