Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Jan 2018 01:52:47 +0000 (09:52 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Jan 2018 01:52:47 +0000 (09:52 +0800)

Trivial merge