Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 06:48:04 +0000 (14:48 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 06:48:04 +0000 (14:48 +0800)

Trivial merge