Merge branch 'MDL-59649-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:58:56 +0000 (08:58 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:58:56 +0000 (08:58 +0200)

Trivial merge