Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle