Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:08:46 +0000 (11:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:08:46 +0000 (11:08 +0800)

Trivial merge