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