Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 9 Nov 2017 04:08:46 +0000 (17:08 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 9 Nov 2017 04:08:46 +0000 (17:08 +1300)

Trivial merge