Merge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 16 Nov 2018 02:54:25 +0000 (10:54 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 16 Nov 2018 02:54:25 +0000 (10:54 +0800)

Trivial merge