Merge branch 'MDL-57600-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 01:16:57 +0000 (09:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 01:16:57 +0000 (09:16 +0800)

Trivial merge