Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 23:43:19 +0000 (01:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 23:43:19 +0000 (01:43 +0200)

Trivial merge