Merge branch 'MDL-58895-master' of git://github.com/ankitagarwal/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 08:53:00 +0000 (16:53 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 08:53:00 +0000 (16:53 +0800)

Trivial merge