Merge branch 'MDL-59166-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 07:26:36 +0000 (15:26 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 07:26:36 +0000 (15:26 +0800)

Trivial merge