Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 05:00:08 +0000 (18:00 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:33 +0000 (19:53 +1300)

Trivial merge