Merge branch 'MDL-59785-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 08:56:08 +0000 (16:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 08:56:08 +0000 (16:56 +0800)

Trivial merge