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