Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle