Merge branch 'MDL-52673-master' of https://github.com/pauln/moodle