Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle