Merge branch 'MDL-61986' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 16:47:02 +0000 (00:47 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Apr 2018 16:47:02 +0000 (00:47 +0800)

Trivial merge