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