Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Mar 2018 06:36:31 +0000 (14:36 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:36 +0000 (18:12 +0200)

Trivial merge