Merge branch 'MDL-61464-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Apr 2018 01:44:05 +0000 (09:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Apr 2018 01:44:05 +0000 (09:44 +0800)

Trivial merge