Merge branch 'MDL-61221-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 16 Jan 2018 15:00:59 +0000 (23:00 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 16 Jan 2018 15:00:59 +0000 (23:00 +0800)

Trivial merge