Merge branch 'MDL-66340' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Sep 2019 02:45:55 +0000 (10:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Sep 2019 02:45:55 +0000 (10:45 +0800)

Trivial merge