Merge branch 'MDL-59740_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 05:48:01 +0000 (13:48 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 05:48:01 +0000 (13:48 +0800)

Trivial merge