Merge branch 'MDL-61444-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 01:59:15 +0000 (09:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 01:59:15 +0000 (09:59 +0800)

Trivial merge