Merge branch 'MDL-59535-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:19:54 +0000 (14:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:19:54 +0000 (14:19 +0200)

Trivial merge