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