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

Trivial merge