Merge branch 'MDL-61957-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:39:34 +0000 (12:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:39:34 +0000 (12:39 +0800)

Trivial merge