Merge branch 'MDL-61377-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Feb 2018 04:52:26 +0000 (12:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Feb 2018 04:52:26 +0000 (12:52 +0800)

Trivial merge