Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 15:12:14 +0000 (23:12 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 15:12:14 +0000 (23:12 +0800)

Trivial merge