Merge branch 'MDL-64223-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 28 Nov 2018 05:59:50 +0000 (13:59 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 28 Nov 2018 05:59:50 +0000 (13:59 +0800)

Trivial merge