Merge branch 'MDL-63825' of https://github.com/mkassaei/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 01:36:07 +0000 (09:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 01:36:07 +0000 (09:36 +0800)

Trivial merge