Merge branch 'MDL-59869-master' of git://github.com/Dagefoerde/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 02:40:30 +0000 (10:40 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 02:40:30 +0000 (10:40 +0800)

Trivial merge