Merge branch 'MDL-59797-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:05:15 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:05:15 +0000 (10:05 +0800)

Trivial merge