Merge branch 'MDL-62597-master' of https://github.com/HuongNV13/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 01:42:36 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 01:42:36 +0000 (09:42 +0800)

Trivial merge