Merge branch 'MDL-65622-master' of https://github.com/dmitriim/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 13 Jun 2019 01:48:32 +0000 (09:48 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Jun 2019 16:04:56 +0000 (18:04 +0200)

Trivial merge