Merge branch 'MDL-58235-master-3' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 13:46:01 +0000 (15:46 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 13:46:01 +0000 (15:46 +0200)

Trivial merge