Merge branch 'MDL-60298' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 9 Oct 2017 08:18:36 +0000 (16:18 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 9 Oct 2017 08:18:36 +0000 (16:18 +0800)

Trivial merge