Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:37:52 +0000 (11:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:37:52 +0000 (11:37 +0200)

Trivial merge