Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 03:26:34 +0000 (16:26 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 03:26:34 +0000 (16:26 +1300)

Trivial merge