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