Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 15:56:45 +0000 (16:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:17 +0000 (10:50 +0200)

Trivial merge