Merge branch 'MDL-61678' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 04:33:24 +0000 (12:33 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 04:33:24 +0000 (12:33 +0800)

Trivial merge