Merge branch 'MDL-61183-master' of git://github.com/farhan6318/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 03:00:07 +0000 (11:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 03:00:07 +0000 (11:00 +0800)

Trivial merge