Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Sep 2017 13:24:12 +0000 (14:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:58:38 +0000 (10:58 +0200)

Trivial merge