Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:34:36 +0000 (09:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:34:36 +0000 (09:34 +0200)

Trivial merge