Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle