Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 10:33:02 +0000 (12:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:14 +0000 (10:50 +0200)

Trivial merge