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