Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:32 +0000 (12:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:32 +0000 (12:28 +0200)

Trivial merge