Merge branch 'MDL-54797' of git://github.com/aolley/moodle