Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 7 Mar 2017 11:15:46 +0000 (12:15 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 7 Mar 2017 11:15:46 +0000 (12:15 +0100)

Trivial merge