Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 14:18:53 +0000 (16:18 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 14:18:53 +0000 (16:18 +0200)

Trivial merge