Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 6 Nov 2017 22:31:45 +0000 (11:31 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 6 Nov 2017 22:31:45 +0000 (11:31 +1300)

Trivial merge