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

Trivial merge