Merge branch 'MDL-64030-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 23 Nov 2018 03:14:57 +0000 (11:14 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 23 Nov 2018 03:14:57 +0000 (11:14 +0800)

Trivial merge