Merge branch 'MDL-29701-master' of https://github.com/phuchau1509/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 01:42:24 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 01:42:24 +0000 (09:42 +0800)

Trivial merge