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

Trivial merge