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