Merge branch 'MDL-63826' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 1 Nov 2018 01:28:45 +0000 (09:28 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 1 Nov 2018 01:28:45 +0000 (09:28 +0800)

Trivial merge