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