Merge branch 'mdl63321-master' of https://github.com/tlock/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 07:34:59 +0000 (15:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 07:34:59 +0000 (15:34 +0800)

Trivial merge