Merge branch 'MDL-58887-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 02:05:46 +0000 (15:05 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 02:05:46 +0000 (15:05 +1300)

Trivial merge