Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle