Merge branch 'MDL-67436-master' of https://github.com/jondo/moodle