Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 00:55:47 +0000 (08:55 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 00:55:47 +0000 (08:55 +0800)

Trivial merge