Merge branch 'master_MDL-59857' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 01:06:56 +0000 (03:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 01:06:56 +0000 (03:06 +0200)

Trivial merge