Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 7 Mar 2017 12:13:51 +0000 (13:13 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 7 Mar 2017 12:13:51 +0000 (13:13 +0100)

Trivial merge