Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:29:53 +0000 (15:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:29:53 +0000 (15:29 +0800)

Trivial merge