Merge branch 'MDL-17943_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 18:23:57 +0000 (20:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 18:23:57 +0000 (20:23 +0200)

Trivial merge