Merge branch 'MDL-35788-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 02:13:40 +0000 (10:13 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 02:13:40 +0000 (10:13 +0800)

Trivial merge