Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 06:39:46 +0000 (14:39 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 06:39:46 +0000 (14:39 +0800)

Trivial merge