Merge branch 'MDL-40613_master-fix' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 01:57:38 +0000 (09:57 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 01:57:38 +0000 (09:57 +0800)

Trivial merge