Merge branch 'MDL-65696-MOODLE-master' of https://github.com/kristian-94/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 08:55:06 +0000 (16:55 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 08:55:06 +0000 (16:55 +0800)

Trivial merge