Merge branch 'MDL-59578-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:09:44 +0000 (11:09 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:09:44 +0000 (11:09 +0200)

Trivial merge