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