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

Trivial merge