Merge branch 'MDL-59833_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 28 Aug 2017 03:54:44 +0000 (11:54 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 28 Aug 2017 03:54:44 +0000 (11:54 +0800)

Trivial merge