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