Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle