Merge branch 'MDL-62432-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 01:34:18 +0000 (09:34 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 01:34:18 +0000 (09:34 +0800)

Trivial merge