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

Trivial merge