Merge branch 'MDL-63531-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 30 Oct 2018 02:50:52 +0000 (10:50 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 30 Oct 2018 02:50:52 +0000 (10:50 +0800)

Trivial merge