Merge branch 'MDL-59629-master' of git://github.com/peterRd/moodle