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