Merge branch 'MDL-64561-master-test' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 25 Feb 2019 07:50:56 +0000 (15:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 25 Feb 2019 07:50:56 +0000 (15:50 +0800)

Trivial merge