Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Sep 2017 11:28:53 +0000 (13:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:53:32 +0000 (10:53 +0200)

Trivial merge