Merge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 12 Oct 2017 06:31:17 +0000 (14:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 12 Oct 2017 06:31:17 +0000 (14:31 +0800)

Trivial merge