Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 09:03:04 +0000 (10:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:46:56 +0000 (10:46 +0200)

Trivial merge