Merge branch 'MDL-63012-master' of https://github.com/jobyh/moodle