Merge branch 'MDL-59908-master' of git://github.com/ankitagarwal/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 09:41:39 +0000 (17:41 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 09:41:39 +0000 (17:41 +0800)

Trivial merge