Merge branch 'MDL-51250_master-empty-return-fix' of git://github.com/dmonllao/moodle