Merge branch 'MDL-66391-master' of https://bitbucket.org/isprynt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Sep 2019 01:59:01 +0000 (09:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Sep 2019 01:59:01 +0000 (09:59 +0800)

Trivial merge