Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 05:24:15 +0000 (18:24 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 05:24:15 +0000 (18:24 +1300)

Trivial merge