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