Merge branch 'MDL-59748-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Aug 2017 09:49:05 +0000 (11:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Aug 2017 09:49:05 +0000 (11:49 +0200)

Trivial merge