Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle