Merge branch 'MDL-58889-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Aug 2017 02:23:31 +0000 (04:23 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Aug 2017 02:23:31 +0000 (04:23 +0200)

Trivial merge