Merge branch 'MDL-62605-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Jun 2018 06:54:21 +0000 (14:54 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:00 +0000 (11:16 +0200)

Trivial merge