Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:44:14 +0000 (11:44 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:44:14 +0000 (11:44 +0200)

Trivial merge