Merge branch 'MDL-62897-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 04:42:31 +0000 (12:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 04:42:31 +0000 (12:42 +0800)

Trivial merge