Merge branch 'MDL-60307-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 05:43:22 +0000 (13:43 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 05:43:22 +0000 (13:43 +0800)

Trivial merge