Merge branch 'master_MDL-41806' of git://github.com/totara/moodle