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