Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 04:10:51 +0000 (12:10 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 04:10:51 +0000 (12:10 +0800)

Trivial merge