Merge branch 'MDL-59460_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 10:23:37 +0000 (12:23 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 10:23:37 +0000 (12:23 +0200)

Trivial merge