Merge branch 'MDL-63690-master-integration' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 31 Oct 2018 04:54:24 +0000 (12:54 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 31 Oct 2018 04:54:24 +0000 (12:54 +0800)

Trivial merge