Merge branch 'MDL-40695-master' of https://github.com/HuongNV13/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Oct 2018 04:28:58 +0000 (12:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Oct 2018 04:28:58 +0000 (12:28 +0800)

Trivial merge