Merge branch 'MDL-57945-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:24:31 +0000 (13:24 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:24:31 +0000 (13:24 +0200)

Trivial merge