Merge branch 'MDL-61249-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Feb 2018 22:10:14 +0000 (23:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Feb 2018 22:10:14 +0000 (23:10 +0100)

Trivial merge