Merge branch 'MDL-61898-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:46:56 +0000 (13:46 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:46:56 +0000 (13:46 +0800)

Trivial merge