Merge branch 'MDL-62266-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:33:40 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:33:40 +0000 (12:33 +0800)

Trivial merge