Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 08:16:42 +0000 (16:16 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 08:16:42 +0000 (16:16 +0800)

Trivial merge