Merge branch 'mdl-58485' of https://github.com/Dagefoerde/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 14:31:58 +0000 (16:31 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 14:31:58 +0000 (16:31 +0200)

Trivial merge