Merge branch 'MDL-55532-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Mar 2018 07:35:29 +0000 (15:35 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:42 +0000 (18:12 +0200)

Trivial merge