Merge branch 'MDL-60150' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 06:04:55 +0000 (14:04 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 06:04:55 +0000 (14:04 +0800)

Trivial merge