Merge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 05:56:56 +0000 (13:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 05:56:56 +0000 (13:56 +0800)

Trivial merge