Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 08:09:35 +0000 (10:09 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 08:09:35 +0000 (10:09 +0200)

Trivial merge