Merge branch 'MDL-57991-master' of https://github.com/micaherne/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:40:59 +0000 (09:40 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:40:59 +0000 (09:40 +0200)

Trivial merge