Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle