Merge branch 'MDL-64119-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Nov 2018 01:52:56 +0000 (09:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Nov 2018 01:52:56 +0000 (09:52 +0800)

Trivial merge