Merge branch 'MDL-61974-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 05:17:21 +0000 (13:17 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 05:17:21 +0000 (13:17 +0800)

Trivial merge