Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)

Trivial merge