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