Merge branch 'MDL-60196_master' of https://github.com/mfabriczy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:55:54 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:55:54 +0000 (00:55 +0200)

Trivial merge