Merge branch 'MDL-62135-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 09:37:47 +0000 (17:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 09:37:47 +0000 (17:37 +0800)

Trivial merge