Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:20:39 +0000 (15:20 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:20:39 +0000 (15:20 +1300)

Trivial merge