Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle