Merge branch 'MDL-61826-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 08:58:22 +0000 (16:58 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:38 +0000 (11:16 +0200)

Trivial merge