Merge branch 'master_MDL-67872' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Mar 2020 01:45:37 +0000 (09:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Mar 2020 01:45:37 +0000 (09:45 +0800)

Trivial merge