Merge branch 'MDL-61960-master' of git://github.com/farhan6318/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jul 2018 23:23:50 +0000 (07:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jul 2018 23:23:50 +0000 (07:23 +0800)

Trivial merge