Merge branch 'MDL-59855-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 03:43:36 +0000 (11:43 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 03:43:36 +0000 (11:43 +0800)

Trivial merge