Merge branch 'MDL-61902-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:19:59 +0000 (10:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:19:59 +0000 (10:19 +0800)

Trivial merge