Merge branch 'MDL-58555' of https://github.com/timhunt/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 12:08:27 +0000 (14:08 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 12:08:27 +0000 (14:08 +0200)

Trivial merge