Merge branch 'mdl-66280' of https://github.com/Peterburnett/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Aug 2019 02:22:04 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Aug 2019 02:22:04 +0000 (10:22 +0800)

Trivial merge