Merge branch 'MDL-66944_master' of https://github.com/t-schroeder/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Oct 2019 05:47:42 +0000 (13:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Oct 2019 05:47:42 +0000 (13:47 +0800)

Trivial merge