Merge branch 'MDL-57927-master' of git://github.com/lameze/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 13:55:17 +0000 (15:55 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 13:55:17 +0000 (15:55 +0200)

Trivial merge