Merge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Mar 2018 07:01:44 +0000 (15:01 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:39 +0000 (18:12 +0200)

Trivial merge