Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:19:20 +0000 (12:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:19:20 +0000 (12:19 +0800)

Trivial merge