Merge branch 'MDL-40613_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 08:50:29 +0000 (16:50 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 08:50:29 +0000 (16:50 +0800)

Trivial merge