Merge branch 'MDL-61005-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Feb 2018 21:12:23 +0000 (22:12 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:52 +0000 (08:30 +0800)

Trivial merge