Merge branch 'MDL-53566-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 01:49:56 +0000 (09:49 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 01:49:56 +0000 (09:49 +0800)

Trivial merge