Merge branch 'MDL-60925-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 01:32:26 +0000 (14:32 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 01:32:26 +0000 (14:32 +1300)

Trivial merge