Merge branch 'MDL-56673-fix' of git://github.com/danpoltawski/moodle