Merge branch 'wip-MDL-58911-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:33:15 +0000 (16:33 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:33:15 +0000 (16:33 +0800)

Trivial merge