Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 10:01:52 +0000 (12:01 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:49:36 +0000 (10:49 +0200)

Trivial merge