Merge branch 'MDL-62386-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 01:10:50 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 01:10:50 +0000 (09:10 +0800)

Trivial merge