Merge branch 'MDL-65204-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Apr 2019 02:57:12 +0000 (10:57 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Apr 2019 02:57:12 +0000 (10:57 +0800)

Trivial merge