Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:55:53 +0000 (01:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:55:53 +0000 (01:55 +0200)

Trivial merge