Merge branch 'MDL-51189-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Feb 2018 07:43:47 +0000 (15:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Feb 2018 07:43:47 +0000 (15:43 +0800)

Trivial merge