Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 01:49:49 +0000 (09:49 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 01:49:49 +0000 (09:49 +0800)

Trivial merge