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

Trivial merge